Adds naive host imports + some test fixes