added more tests, fixed whitespace/tab issues