improve errors / tests