Added first test and implementation