Adding initial test, removing verbose logging