Fix tests

Fixed some tests.

1 test left that's not passing. Proposition - remove it.

Please review.