First go at getting all tests to pass