Fix atlas test

 * Recreates composition for every test and therefore removes internal
   dependency
 * Reorders method calls to make the test pass