Moved additional tests