CY2008Swiss test and tables clean -up