Simplify code, add CSSOM library, rename test folder