Removed unnecessary beans.xml files, re-organize tests a bit