Added a test and started pushing messages around