Modified unit test/documentation