Adding tests for manager and flushing it out