Fixing up tests to become automated