Implements first test and fix