Add test requirements
Refactor unrealted tests into different files
Update imports and style