Adding Apache license info and working on tests