Update test. Bugs fix.