Less requests for now
Added test utility
Added file listing