[3rd commit] Adding tests