Started quality insurance work (Adding Unit tests)