Added better automated test support