Added some tests/other small changes

.