More tests added , environment prettified