Restructured the tests. Made them all pass.