made changes to tests and fixed issue