More tests

More pos tests and fixes to make them pass