Fixed tests 0001 and 0002