bugs fixed
test is finished