Added Faker, cleaned up tests