Deleted unnecessary import
Revert "Deleted unnecessary import"

This reverts commit 1e0a97423e1d3c3e7f444d150b0603c60b83e052.
More tests and comments