Test and configuration containers
rearranged all the classes