Refactored CMakeLists and updated W3C tests