Added tests for two more layers, see #1
Merge branch 'master' into alberto-cpp
Changed std to atm