Add support for unitest layout