Some little additions for a test