Restructured unit tests
Version bump