Singleton in data corrected and tests added.