Adding support for lab and adding missing test