Put status on top
Cleanup test files