Fixing basic tests