Move Scanner into macro-subproject, separate Scanner tests into own Spec