Added basic tests with fixes
whitespace fix