Made the test fixture generic...