better handling
better test