fix problem with test. Still need too check if all test pass.