Added osources and test