updating test package structure, fixing src package issues