Added failing test, fixed some others