A few more tests, fixed a few issues with expectations