Removed test prefix/suffix