adding namespaced define/require, improving tests