Added more tests and fixed a couple of small bugs
Merge branch '0.6' of github.com:codeparty/derby into 0.6