More tests, some if it implemented