- cleanup and additional tests