add a test and some changes...