Start test unification
Start moving towards a single html file