Update test, add new, refactor