fixed name
added tests for availability