Improve test subject