Added small fixtures and increased timeout for tests