Merged mock and actual into 1 file