Cleaned up unused import and two unused variables
Added test for the fix I did for #53.