16 of 19 tests passing