Added test targets, made sure that tests run
11 files changed