Cleaned up a few tests
Merge commit 'origin/development' into development