Updated source according to last version on OK
Updated test to reflect what's on OK site