Moved over more test code