uniformize fixtures loading
move test fixtures outside auto loading namespace
trying to optimize match class