a couple test and bug fixes