More tests, some which are ignored for now but should eventually pass