Resolve a bug causing unnecessary package recompiles in 2.0.0 and improve test coverage in this area