simplify app paths and create unit tests