TESTs is added. small fixes