Fixed building configuration and unit tests