Added additional trivial methods and tests