Some fixes in test fixtures

Some fixes and testing to resolve supertest errors that causes tests to fail.