Fixed comments and added more tests