Updated a bit on tests