more test refactoring to proper syntax