Performance improvement for testing. Closes #7