retrofitted package names, added junit test