Added a few tests..still playing around with things