Updated + bulked up tests