Update tests, refactor code