Modifications
New tests