couple new test items & small tweaks