cleanup and some sound tests