Merge Test into Master

backend has been tested and is ready to be merged to master/production