Added crude tests and began move to Faraday