Added package declarations and a few unit tests