#2 fixed tests and updated some data-access fields