Fixed broken tests, bumped version

These commits comprise fixes for broken unit tests and additional tests.