Fixed unittests for collections, and added new methods for the Build method