rm Lightning Touch, add tests