fn test refactor 1
functional test splitting
moved tests around