Most (if not all) tests passing