Prod tests passing

Fixed the failing remote tests.

Please look this over and do suggest cleaner solutions!