Fixed sample builders unit tests