1.0.0 dev

more fixings for unit tests