pushed new version

circular dependency in for tests made me do it