Modifed tests