Fixing deployment (with some inital testing code piggybacking)