Added alternative solutions for functional testing

(also see #1)