--- a/LazyTensors/test/runtests.jl	Mon Jun 24 14:04:38 2019 +0200
+++ b/LazyTensors/test/runtests.jl	Mon Jun 24 14:43:37 2019 +0200
@@ -57,29 +57,60 @@
     @test_broken BoundsError == (m*m*v)[7]
 end
 
-
-@testset "Lazy elementwise operations" begin
-    struct DummyLazyArray{D} <: LazyArray{Int,D}
-        size::NTuple{D,Int}
+@testset "LazyArray" begin
+    struct DummyArray{T,D, T1<:AbstractArray{T,D}} <: LazyArray{T,D}
+        data::T1
     end
-    Base.size(a::DummyLazyArray) = a.size
-    Base.getindex(a::DummyLazyArray, I...) = prod(I)
-
-
-    a = DummyLazyArray((3,))
+    Base.size(v::DummyArray) = size(v.data)
+    Base.getindex(v::DummyArray, I...) = v.data[I...]
 
-    @test (a+a)[3] == 6
-    @test (a-a)[3] == 0
-    @test (a*a)[3] == 9
-
-    a = DummyLazyArray((4,))
-    b = [3,2,1,2]
+    # Test lazy operations
+    v1 = [1, 2.3, 4]
+    v2 = [1., 2, 3]
+    r_add = v1 .+ v2
+    r_sub = v1 .- v2
+    r_times = v1 .* v2
+    r_div = v1 ./ v2
+    @test isa(v1 +̃ v2, LazyArray)
+    @test isa(v1 -̃ v2, LazyArray)
+    @test isa(v1 *̃ v2, LazyArray)
+    @test isa(v1 /̃ v2, LazyArray)
+    for i ∈ eachindex(v1)
+        @test (v1 +̃ v2)[i] == r_add[i]
+        @test (v1 -̃ v2)[i] == r_sub[i]
+        @test (v1 *̃ v2)[i] == r_times[i]
+        @test (v1 /̃ v2)[i] == r_div[i]
+    end
+    @test_throws BoundsError (v1 +̃  v2)[4]
+    v2 = [1., 2, 3, 4]
+    # Test that size of arrays is asserted when not specified inbounds
+    @test_throws AssertionError v1 +̃ v2
+    # Test that no error checking is performed when specified inbounds
+    res = (v1,v2) -> (@inbounds (v1 +̃ v2)[1] == 2)
+    @test res(v1,v2)
 
-    @test (a+b)[4] == 6
-    @test (a-b)[4] == 2
-    @test (a*b)[4] == 8
-
-    @test (b+a)[4] == 6
-    @test (b-a)[4] == -2
-    @test (b*a)[4] == 8
-end
\ No newline at end of file
+    # Test operations on LazyArray
+    v1 = DummyArray([1, 2.3, 4])
+    v2 = [1., 2, 3]
+    @test isa(v1 + v2, LazyArray)
+    @test isa(v2 + v1, LazyArray)
+    @test isa(v1 - v2, LazyArray)
+    @test isa(v2 - v1, LazyArray)
+    @test isa(v1 * v2, LazyArray)
+    @test isa(v2 * v1, LazyArray)
+    @test isa(v1 / v2, LazyArray)
+    @test isa(v2 / v1, LazyArray)
+    for i ∈ eachindex(v2)
+        @test (v1 + v2)[i] == (v2 + v1)[i] == r_add[i]
+        @test (v1 - v2)[i] == -(v2 - v1)[i] == r_sub[i]
+        @test (v1 * v2)[i] == (v2 * v1)[i]  ==  r_times[i]
+        @test (v1 / v2)[i] == 1/((v2 / v1)[i])  ==  r_div[i]
+    end
+    @test_throws BoundsError (v1 + v2)[4]
+    v2 = [1., 2, 3, 4]
+    # Test that size of arrays is asserted when not specified inbounds
+    @test_throws AssertionError v1 + v2
+    # Test that no error checking is performed when specified inbounds
+    res = (v1,v2) -> (@inbounds (v1 + v2)[1] == 2)
+    @test res(v1,v2)
+end