renaming
improved tests