made code changes, tests need to be fixed