Fixed import stuff and tested