changed some names, added strictness to tests