I think I'll pull those tests out into a separate class so it is more clear where they are.