fixing the last tests