fix some tests and added some new ones