Fixed the namespacing compatibility of resting classes which have not unit-tested. #18