Clean up...just missing tests