fixing some unit tests and old style examples