Small fixes in test program