remaining updates
Merge pull request #92 from AndreiH/remaining_tests

Remaining fixes on remaining tests