Tidied up superfluous specs and stubs