Adding in tests