Using lab and adding missing tests