Update+add tests