Fixed test and rearranged context files