Added/Changed a few tests
Merge commit '282363f2f679a84f3aa1c42e4c62f65771fc4b2b'
merge