Tests should set a good example and use the api new-style!
All tests, except those where the static singleton api is explicitly being tested