Version 1 4 wp tests

Minor updates to get tests working.