PORTALNGO-47: swapped argument order for readability and tided up tests