Removes the stub classes

Resolves #18.
Also increased test coverage