Evening Commit

Created further improvements t the API and the Testing Suite.