psr-4 compliance
adds HTML tests
tweaks