removing bootstrap and including everything in tests themselves