All initial tests passing, writes and reads working