Added reverse arg fix, tests working