fix tests + remove obsolete code + rename methods (based on review comments)