Added automated testing support