Fixed up some unit tests
Set up foundation bundle