Refactored tests to better work with 2014.7.0 and allow easier setup