Fixed package paths; Some scenarios moved to test packages.