Cleanup and updated tests