almost done with initial tests