Testing and cleaning up...