fixes and initial tests