Major refactor of service libs, more tests