made some changes, new test