Unit test updates, begin builder, prepare testcases