Added tests
Made namespaces consistent with BlockBundle