Finished test classes and fixed small typos in other classes