Submitting my unit/acceptance tests
merge