Added several tweaks for testing

Signed-off-by: Keff <funnykeff91@gmail.com>