Implemented a basic wait class and improved waits for all FPS tests