Removed whitespace and improved test organization