Increased timeout, re-jigged dependencies and moved unit tests up