cleaning up tests and adding spec for tap