Refactor tests to test both calling types together