Replace old functions

[msberends]

As least check for funs(). But also check unit testing - set that up too.