fixed whitespace + added tests