More tests and nosql support