Fleshed out some tests