Cleaned up song and tests