Added first draft of tests