Followup on CR-BITMAG-316. Removed superfluous unit-tests, and added one of them to the integration test