Added tests to wrap it all up