Properly export functions
Finish tests, separate test data and test logic
Re-write test data
Be strict!