Adds base tests; adds Exceptions; Updates base classes