Cut the FC003 nagging
Fixed default unit test
Cleaning/DRYing up the integration tests