remove an erroneous  import statement
Address comments by @iguananaut; add m ore tests