Added more test cases for builder and updated builder class, added base of reader class