cleanup and additional tests