Added Ridwan and Matt's unit/acceptance tests