Reorganize files to ease testing
Test utility functions