Improved selftesting