updated tests to cope w/ new features