Adding first pass functional testing