add in and fixed first functional test