expand mocha tests some