Moved Tests Inside Stages