Updates with more tests