Cleaned the code to output test page + added 2 hacks