Added code from first test