Improve Tests