#290 Improve Test