added support for angular; improved test skeleton