Reorganize and repass all tests