Improved tests
fixed clang warning with || and &&
cleaned up whitespace