Added some test cases; normalized some whitespace
Added several test cases