Removed unnecessary test and fix namespace