Added some feature tests and fixed a couple more bugs