Task #5614
Added tests and several build targets