Improve/tests