Completed initial tests and initial functionality