clean-up some core test

Change-Id: Ie6e1e666f3d886802c45d35e0e7a7ddc965cad8d
Signed-off-by: Jacques Bouthillier <lmcbout@gmail.com>
4 files changed