Improved and simplified tests