Some impreovements on tests.