UMD wrapper
Reformat tests a bit