Developer-Setup Unittest 

Please review code and merge into master.