Fixed tests

Fixed tests