Add two tests to master

Tulay Cuhadar Donszelmannrequested to merge
tcuhadar/athena:fc-mar30 into master

Adding two tests from 21.3 to master. Does not affect reconstruction. @vpascuzz , @jchapman

Merge request reports