Made tests work

Working on revisiting tests on the code I've messed with.