Cleaned up test, added new win-condition.