Polish test code
Mark as using fixture, rather than parameter