moving initial specs to their places in the test code.