Fixed various tests