Changed test and added todo