Location and unit loading
Remove old tests