fixes and an additional test