Added missing files
Refactored tests with test fixture