all tests passing, phew