Removed useless imports
Formalized the start of testing and pebble-sensitive code