#10, #14 Fixed compile issues and implemented more tests