Implemented a testing method, allowing most of the unit tests to pass