Fist couple of tests in place