Added test support (still in progress).