Reordered a few lines for clarity
Started a test suite