got all tests under 50 working