remove video and question imports, tidy up specs and improve coverage in few areas