boosted up and simplified tests startup