cleanup and overall testing