Improve tests

read more at #3