Fixed unit tests, fiddled a bit