Updated Java Beans and Unit Test to match server schema.