putting tests where they should be