fixup! fixup! added more tests