Add more unit tests for builder class