Fixed unit test and make clean remove ObjectStore directory.