cleanup and adding additional tests