Moved tests under own namespace