Cleaned up test. Updated test command. Closes #12