cleaning up spec and src for tests