test + fixed last test