Updated framework and fixed unit tester