Initial revision with working test example