#34 Converted spaces to tabs; #31 Tests are more descriptive
#31 New tests added