Updated comments, added test files