Added test packages.
Reviewed by Simon