OAK-440 Add more write tests