import working, updated a few tests