changed args and modified tests