Remove foundry dependency, add more tests