Adds 2 tests and everything else;