Some bug fixes and started low level services tests.