More unit tests; cleaned up SQWRL API