reformatted imports and added tests