test based now save apart from validator based.
Will no longer return everything if only context supplied
Added add(Statement) and commit. Plus test clean up
import cleanup