More additions and first test