General Commit: Minor changes
Added some more tests