Fixing Tests to commit 2bca947