Moved baseline tests to dynamic tests