better tests
better coverage