Created unit test, updated stuff