Add information regarding unit testing to docs (#74)
Fix merge conflicts