Jh/upload tests