Moved interfaces to separate file and started unit tests