Improve testing suite