some general cleanup
added testing to setup