Fix bug in tests calling incorrect super classes