Did some work on tests

also edited comments