Made function calls in tests and classes consistent