fixed broken test, tidied up packages