Adding tests (Johny)