fix tests and improve structure based on code review
fix tests and improve structure based on code review

robbiejackson/osra,gmunumel/osra,NikitaAvvakumov/osra,ZmagoD/osra,evo2013/osra,gmunumel/osra,guangfanxu/osra,robbiejackson/osra,PurityControl/osra,razorcd/osra,PurityControl/osra,gmunumel/osra,guangfanxu/osra,razorcd/osra,SergiosLen/osra,b264/osra,AgileVentures/osra,b264/osra,jmorcate/osra,robbiejackson/osra,motasem-salem/osra,SergiosLen/osra,evo2013/osra,guangfanxu/osra,jmorcate/osra,SergiosLen/osra,b264/osra,jmorcate/osra,PurityControl/osra,AgileVentures/osra,ZmagoD/osra,NikitaAvvakumov/osra,ZmagoD/osra,motasem-salem/osra,AgileVentures/osra,motasem-salem/osra,razorcd/osra,NikitaAvvakumov/osra