slight restructuring
tests should be runnable on zoo machines
added fonts back