Added tests for things to get better coverage, also added some basic functionality for effects, still to be augmented