More test stubs; refactoring some constants to the constants file