Adjusted some tests
Fixed a couple of little things