* last try: fix failure tests to actually test the right things
* last try: fix failure tests to actually test the right things

dwvanstone/buttonmen,dwvanstone/buttonmen,dwvanstone/buttonmen,dwvanstone/buttonmen,dwvanstone/buttonmen,dwvanstone/buttonmen