Change namespace, make tests separate