Minor updates in allocator + added tests