Added some waiting for enhancements. Separated tests