Design improved and remove, find_by methods tested