Made modification to tests and camcelcasing