Improved testing for the @ functionality in the testsuite