fixxing last tests