spf: updated tests, added a couple more