Mass update to the latest things, minor code refactor and test simplification