Adding Unit and Acceptance Tests

Used JBaier's acceptance tests