Work on some testing
Make file handler public for testing