Continued bulding back end, added som tests