finished first draft of tests