Removed a few comments added some more tests