added/changed some tests