Update/refactor tests