Very close to first working test