Adds more core tests