Got more (if not all) tests to pass.