Add functional test to make sure things are working. Plus make things work.