Adapted other Basic tests
Adapted Factories tests