pushed new version

circular dependency for tests made me do it