remove test statements
struggling with regexp