add utilities for testing apps using rift
integrate testing utils and test them
fix merge issues