tests cleanedup