Added back test (nosql excluded), ported from web2py