convert to test
fix lib loc
update locations
organise tests