Fix and remove(not used) tests